bitkeeper revision 1.1108.33.2 (4107ea5crZ__llMFfeSxzPDcA35jUg)
authorgm281@boulderdash.cl.cam.ac.uk <gm281@boulderdash.cl.cam.ac.uk>
Wed, 28 Jul 2004 18:03:08 +0000 (18:03 +0000)
committergm281@boulderdash.cl.cam.ac.uk <gm281@boulderdash.cl.cam.ac.uk>
Wed, 28 Jul 2004 18:03:08 +0000 (18:03 +0000)
Merge boulderdash.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into boulderdash.cl.cam.ac.uk:/auto/anfs/scratch/boulderdash/gm281/xeno-clone/xeno.bk

1  2 
xen/common/domain.c

Simple merge